Added schema awareness.
public schema now also supported