CON-307 | More changes