Prepared for future implementing to GDX