Added simple item and container classes