Current schema hard coding removed.