Build works, Add class utils