Added advanced boundary setting