Update files accodingly to recent changes