Implementation improvements