added more stubs and implementation in user