Updated to provide an integration point for futher functionality