Enhanced some classes, add a utility method