Added some general features