Added snippet support