Added helpers to Aeolus