Fixed setup and transported over utility classes from Handlefish