Functionality improvement

Some additional functionality