Add more task to build system