Added width and height fields