Adding /latest. Done some refactoring here and there