Did some work on Room.class