Merge config and state types into Core module