Refactored completion generating methods