Added most of specialty functionality