Fixed authorization, Fixed core, Added Genre support