Added configurable address