Add addAll method
Add id, fromMap() and flags