Updated BuildFile and collection