Hard coded values removed