CMK - moved interface
More changes