Added support for maven properties