Removed @Override annotation for classes not supported by 1.5 and
replaced .isEmpty()