Use a utility class to keep Class API clean
Update usage