Removed warnings and added class prefix