Introduce options object and add custom error tags