Updated tapkee defines