[08-03-13] Classes updated. Some Annotations removed.