DEV: Remove usage of setter