Improve interface implementation