JPAContainer, Table, special component column

I have a Table which shows a database table’s records and there are 2 additional columns, one is a Button column and the other one is a CheckBox column. I use JPAContainer as data source. To add the Button and the CheckBox, I added them as transient fields and added getters to the entity to access it with the container, and added the click listener to the Button with iterating in the Table’s items and getting the property and the Button in the property, and adding the listener to the Button (as I didn’t want to add it inside the entity). It works well, but there are is a problem with the solution:
The entities are not separated from the UI layer, as they contain Vaadin components. It’s not only bad because theoretical reasons, but I also use the same entities in other environment, e. g. I get them with a desktop client and if they contain field with Vaadin components, even if they are null at client side, I have to include Vaadin libs, but I don’t want to include them in a desktop application.
So is there a better solution for it, or the only solution is not to use JPAContainer when there are special colums in the table?

Instead of adding column to the Container, I would suggesting adding a
generated column to the table