Moved internals to new options
Added dependencies