Added actors, refactored erbs