WIP Added new embargo types