Modifications to allow extensibility
Fix for missing parameter