Now working with full typescript