Updated project with new architecture