Added edge cases of the specification and simplified sdk