Added bounds supports