Removed deprecated methods and added UML diagram