[BUGFIX] Changed ts setup and added file include options