Adding some new features and specs