Added button and Vector3f support