More work on drawable component