Kadira enabled & Refactored