Added Entity Effect implementation, re-added explicit IDs