Refactoring & Implement check activation status