Fixed configuration to be more dynamic