Refactored Base application