Added hiding place support