Update spec and build out requirements