Classes and Interface updated