Refactor, protect technical methods