Fixing the previous commit bugs! Adding required classes + required methods