Added person and improved other functionalities