Added logic util classes for readability