Added new query functions marked as obsolete the old methods.
Renames on method and classes.