Added headers and source for state tracking and options