Replaced with header file