Removed circular dependencies with Marvin