Version 2.5.0-SNAPSHOT

Lots of changes