Added workaround to get features