Reworked based on Utility project