Ticket0449 - Refactor parts of version 0.9