Now using current_project() scheme.