Improved building.
Added key handle deprecation.