Add / rename some properties