added a few more keys for activity and made it a bit more flexible