Added entry_id prefixes to prevent duplicate entrys