Fixes specs and adds Base IDs