Changed visibility to public for framework use