Extracted data classes.
Removed stack.