Removed mandatory params check