Improvements on the Doors library