Make sure everything is required as necessary