Added handling of deprecated functions