New feature: Code changes for project support