Fixed implementation of header file