Updated external interface