Some Checkstyle errors with headerguards
Add some new implementions