Implemented functionality refinements.