Add stackable support and Title field