Moved these definitions into gen.hpp