Implement data class
Added sorting to data views