safe_constantize instead of rescue
clean up code
Pass options to associations