Fix include guard
Add utilities