Added required attributes