Fixes #21 Concrete models