Added state and scope options