Moved sample conditions to an addon and improved the way that extra conditions are identified.