Improve required attributes