Added some logic for monsters and stores