Refactor For EclipsePlatform