Removed the inclusion of adapter classes and converted more method calls to use adapter classes
Added a missing parenthesis