Fixed bbox & Added keys