Added custom point class