Removed warnings + added class declarations