Adding additional javaloader commands and refactoring