Adjust models constructors & phpdocs