Added some features to castle.