Added thumb factory support