[#7] - Improvements