Spliting identifier and classification - closes #182