Switched to using play-enhancer