Upped version of raptor-templates