Minor change for the external module integration