Added status methods, and fixed containers