Updated Atlas dependency to 0.17.2 and refactored code accordingly.