[FEAT] Continue to iterate on architecture