Added support for project components