Removed obsolete import
Use wrapper types instead of primitives as apparently e.g. Table in Vaadin don't cope with them