Code more flexible