Code will be merged to xmodaler