Refactored option handling and allowed polymorhpic linking in collections