2nd commit with new bean classes