Adding support for long and calendar