Added additional keys

closed #7
closed #8
closed #9