SES-1676 : Add @Override annotations to ValueFactory implementations