Better type support in EPL