Add inflector, add more functions