Added basic structure and options