feat(#11, #12): support new features