Added initial use support