Added code changes

Detail of code changes needed to use with different configurations.