Added some user stubbing