Removing hard coding part