Added Class and Skills interfaces and handlers