Implement Options, Improve Storage