Removing qs module dependency