Added logic and configuration for the Project