Supporting additional button types
Updated to match version in Liger Comon
Testing new button types