Continued work on functions transfer to addons.