Added support for longdongs