Fixed Object Classification as per SQA teams requests