Adding full features