Usage added, hardcode removed