Moved views to public