Added unshift support