added model and entities