Added ability hierarchy support