Add expander helper methods