Implemented new specifications, minor changes in ADT.