Fix the introspectables

Close #5