Added more defs