Add more user/company info from @aashaikh's branch