Factor out features section to separate module