Removed hard coding to accompany db