Updated Object Classification as per SQA team requests