This needs to be changed based on configuration
This needs to be changed based on configuration