Add ucm, remedy export function and logic classes