Added helper methods and fields