Some deprecated functions
Fixed deprecated