AMS- add specs and factories