Moved UCF class from UCF namespace - Fixed interface