Refactored and developed architecture