Cleaned up id releated issues

o Cleaned up forcekey by placing it under events that key
o Renamed defines for id timing