Adding some parameter validation to fields
Adding suffix removal function to utils