Updated build "system"