Updates to smart schema
Updates to fix small bug regarding schema changes