SLT-12 Data model is refactored