Updated composer to have sligher better format
Added some changes to the annotation format
Added some working test code