Added recording, database classes