Added possibility to add new expander definitions