Prepared some things for later development