V2 Update - Major architecture changes