Moved to header files