Refactoring code to separate the Features and Space Api settings
Refactor code