Add support for different location outputs