Add some necessary features