added attributes and fix FC034