Add isEmpty property and helper methods