Add base support (ugly)