Adds user map and implements new architecture