Remove hard coding