Make system even more flexible