Architecture: remove user centrism