Removed NPE handling, added getByField methods