Moved out record declarations to header file