Use named keys when storing things
Close consumption channel
Conditionally enable persistence
Added house drawing