Updated: Use public scope