Added support for custom music