Fixed the classes and added the adapter.