Fixed version
Added remove method to data class