Utilized handy utility classes
Changes in progress