Move FunctionBean back to persistence plugin and encapsulate it inside
the Marshaller