Added support for project_path and company_id filling