Refactoring and inclusion of disable api