Adding include statement, renaming stuffs