Added support for mark and unmark. Fixed ID to be int instead of String