Added: Support for conditional attributes