Added support for extra properties for workspace and project