Improvements and simplification
Added an all method