Make it more flexible