Added support for custom locations ( pass and play only)