If you add extends Serializable here I will merge (if the tests are green).