Models improvements