Make models work properly