Updated a bit model classes