Refactored tags and fields to be separate method calls.