Add logic and static