Added composer / EPV
Moved functions to class