Update code to suit composer rules and replaced non used methods with configuration options