[BUGFIX] Moved trait to proper namespace