Increase shared code and restored lost methods.