Some updates & Refactoring