head and tail support added in new architecture