Added support for custom nibs and cells