Clean a bit the API to make the beabutton and circle easier to create