added mapping
moved IDColumn to types
import fix
type fix