Update to simplify the project