Added basic support for call handling