Fixes #16 - Separate classes from options