Added customValidState proprety to ensure more scalability

Fixed #86