Moving most methods to utils