Change in order to work with PlayFramework