Removed all [<optional>] and sync