Aliases support

. Bug fix on river tests
. Added aliases support