Added advanced features