Initial development and refactoring for feature and step-hook support