Continuing development of BuildSystem