Added few functions
Added Location and Category functionalities