Change getter to have standard type