Moved declarations to .hh