Removed some deprecated methods and added some new methods