DEV: Add Base functional