Reordered implementation methods for consistency