#21 Redesign of model library