added support for other availability metrics