Added support for slots