Implemented more dialect logic