Increase code quality about required fields