Keep backward compatible