Added deprecated functions for backward compatibility
Added deprecated function notices
Minor code improvements