Added another bugfix. ObjectRepository and Storage need to be fetched from the sm before creating options class.