Implemented final support for the public API