Classes and Interfaces updated