Squashed Changes
Changed to extends AbstractStoreOutput
code review changes
Merged pull request #992