Add support for conditional edge cases