add create shortcuts, refactor to common functions