Extract methods to separate modules