CS - some backend work to support user id handling.