Added support for elevation and usage type