Added home and store area instantiation