Added Feature and test