Removing dependency on schema module