Adding schema too...