Dates aliases

Also some refactoring.