Feature/#12 model