Added some design features