Add model for issue24