Added Class Color and some changes to ec2list