PR feedback
Factor out methods in a binary compatible way