Revised person and added new classes