Added Key/Door classes