Improve: Handle middleware using connect