Modified with latest schema plan