Added more static helper methods