Added support for additional integer types