Convenience class for ease of use
Minor changes