Changed to fit the newest build system