Expires model updated to Expiration and relational models fixing