Make more flexible