Fixed: backward compatiblity support